drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
159,417 Commits 1 Branch 0 Tags
Commit Graph

159417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Omkar Kolangade
827fcb7f8d IMS OMA-DM Intent and ImsReasonInfo Additions 
Adding an intent for OMA-DM use case where
the network sends a string error indicating
the device is not provisioned to make calls.
The string the network is expected to send
is added to ImsReasonInfo.

Bug: 18242739
Change-Id: If7f654f834f543523af40b422ea9659c5f0b4de4
 2014-12-16 09:48:27 -08:00
ztenghui
d8ce65c9b5 Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev 2014-12-16 17:45:02 +00:00
Andre Eisenbach
cd460538a4 Merge "Don't send the onServiceDisconnected callback after close." into lmp-mr1-dev 2014-12-16 17:16:55 +00:00
Adam Lesinski
54de298c01 AAPT: Copy android:revisionCode to Splits 
Bug:18706179
Change-Id: I669b56e0b67dd1bfda7749ef433b55af16851154
 2014-12-16 09:16:26 -08:00
Jason Monk
052e9b12f5 Merge "Add config to handle periodic check of tether provision" into lmp-mr1-dev 2014-12-16 15:44:07 +00:00
Benjamin Franz
c88b6bdcfa Don't send the onServiceDisconnected callback after close. 
Bug: 18667402
Change-Id: Ia029fd861d643f6646fb124d76ca2a1d2a1a695a
 2014-12-16 15:33:03 +00:00
Sarah Maddox
48f9c8e48c am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs 
automerge: 8f0f627

* commit '8f0f627e0e76918a57941c71ad49ea6758f68886':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-16 01:39:00 +00:00
smain@google.com
9af05a6899 am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download 
automerge: c21b455

* commit 'c21b4553cbdeb8286a49108ec6059871ad81eba2':
  brute force improve suggestions for sdk download
 2014-12-16 01:37:42 +00:00
Rich Slogar
579110887d am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update 
automerge: b2a9bd5

* commit 'b2a9bd5e9b1984b8aeda17b0c1477e9190fc171e':
  docs: studio 1.0.1 revision update
 2014-12-16 01:36:40 +00:00
smain@google.com
a01e83b266 am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs 
automerge: 63ed5e1

* commit '63ed5e1b7736006f8d4ac5b4e60c453e2b26ad81':
  fix distribute nav styles. they were not highlighted correctly.
 2014-12-16 01:35:19 +00:00
Joe Fernandez
519fbf3ae7 am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs 
automerge: d799f75

* commit 'd799f75c6b3adb088372f73967aee6362407e59b':
  docs: uiautomator blog link removal
 2014-12-16 01:33:56 +00:00
Joe Fernandez
9a05dee5ec am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs 
automerge: 72268ad

* commit '72268ad3d4ecdeaee47ad8de0ec372bb834255c7':
  docs: studio basics typo
 2014-12-16 01:32:49 +00:00
Luan Nguyen
556ce7f145 am 47efca78: am a854ddfd: docs: Add two new general functionality requirements 
automerge: bb01880

* commit 'bb01880e6216c360a4732b02a1becb32520fcf5e':
  docs: Add two new general functionality requirements
 2014-12-16 01:30:17 +00:00
Mark Renouf
1302ee3a23 If no display settings are matched, return the first one. DO NOT MERGE 
automerge: d3adc51  -s ours

* commit 'd3adc51a1b845e37845af6a885ce7371c2ce252c':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-12-16 01:29:01 +00:00
Brian Carlstrom
a00be9b4d5 Remember failed dexopt to avoid retry 
Bug: 18643977
Change-Id: Ida8d9b9ce992d97fb75bccb8c3da0d9d73a480a9
 2014-12-15 15:57:56 -08:00
Jay Shrauner
12b5e504fd Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev 2014-12-15 23:56:53 +00:00
ztenghui
d76da520ed Remove 2 sub-tests from the internal test app. 
b/18171696

Change-Id: I4c4e96c2d0a8e664d81abb300a8f56c5bbb358cd
 2014-12-15 15:47:41 -08:00
Raph Levien
50e9228493 Preserve leading "+" in phone numbers 
The normalizeNumber method in PhoneNumberUtils preserves a leading "+"
but only if it's the first character in the string. Thus it gets
dropped if there is leading punctuation such as "(". This patch
preserves the leading "+" as long as it would be the first character
in the normalized phone number.

Bug: 18418335
Change-Id: Ifcb1d3dd6c2943c729f570e7f3c90d1da9ee8b4b
 2014-12-15 15:46:17 -08:00
Adam Lesinski
0f0e85a689 Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev 2014-12-15 23:35:23 +00:00
Yorke Lee
4f80324540 Revert "Allow home to be pressed while in incoming call screen" 
This reverts commit ad84e0637f43311a05e894393be6538909b937fb.

Bug: 18742942
Change-Id: I6c0a1651526a37cca8e27be9fbd36a2f59943366
 2014-12-15 23:22:06 +00:00
Rich Slogar
88b276970e docs: studio device emulator updates 
Change-Id: If11f5c5cd1c3b990980d83980cdb324700289a6f

 On branch studio-device-emulator-updates
	modified:   docs/html/tools/devices/emulator.jd
 2014-12-15 14:39:25 -08:00
Stuart Scott
482b4246c2 Update mapping between RAF and Network Type. 
bug:18754476
Change-Id: Ibca856fe10bc4a7dc620ab7936a70d1f0427fe56
 2014-12-15 14:11:44 -08:00
Sarah Maddox
8f0f627e0e am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs 
* commit 'aaa37da8e0d358317d85e3bc7bfa363c644f5ef1':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-15 21:57:02 +00:00
Sarah Maddox
aaa37da8e0 am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs 
* commit 'a158abe4542742381861d1360a79db2cdd28be57':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-15 21:50:27 +00:00
Jay Shrauner
ac2506c7e3 Fix NPE in Transport.applyBatch 
Bug:18756774
Change-Id: I1da4f0131b1529598043e4cb9fb226d02bff8669
 2014-12-15 13:25:52 -08:00
Adam Powell
f0af0ea33b Fix touch intercept bug in ResolverDrawerLayout 
ResolverDrawerLayout could get into a state where it thought a drag
was in progress, but since there was no distance to drag it would
return false from onTouchEvent for ACTION_DOWN. This would cause it to
intercept all future touch events, blocking interaction with
ResolverDrawerLayout child views. This would only happen if none of
the child views wanted the initial ACTION_DOWN event and it ended up
being processed in the ResolverDrawerLayout itself, such as in
response to touching in empty space or on the title text, and if all
available options fit in view without needing to expand the drawer.

Fix this by only setting the dragging bit if we're going to claim the
rest of the touch events after ACTION_DOWN.

Bug 18563698

Change-Id: Iab2ec38528697c9ff36bbb08b1f1210a6879d5ef
 2014-12-15 13:18:06 -08:00
Sarah Maddox
a158abe454 Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs 2014-12-15 20:42:40 +00:00
Paul Jensen
f4ffaa4f57 Fix race between CONNECTIVITY_ACTION and setting default network. 
Now that the delay between connectivity changes and CONNECTIVITY_ACTION
has been removed (ag/599650) races between CONNECTIVITY_ACTION and
the setting of the default network become more evident.
In http://crbug.com/441818 Chrome is calling getaddrinfo()
immediately after a device goes from no connectivity to cellular
connectivity, and Chrome is erroneously getting back EAI_NODATA
because netd hasn't yet set the default network for DNS resolutions.

bug:18757162
Change-Id: Ib607dcb3697403272a8c838713a9cb602e9c6820
 2014-12-15 15:20:30 -05:00
Jorim Jaggi
613fffcd0f Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev 2014-12-15 19:56:45 +00:00
Jim Miller
a8800f7c27 Revert "Revert "Attempt to fix keyguard missing bug"" 
This reverts commit 1991590ddd0ca6d3a0cac290b65120c147034dbc
and fixes a bug where we were showing the scrim on devices without keyguard.

Bug: 18468369
Change-Id: Idce1370dadacd09c4a8f1a7fd9728c23b218d19c
 2014-12-15 20:12:09 +01:00
Amit Mahajan
d060b50b33 Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 2014-12-15 19:06:48 +00:00
Rich Slogar
c819d3df86 docs: studio revision 21 update 
Change-Id: I61a6fa657aae08760a73816d5ad5536957a3be20
 2014-12-15 10:46:18 -08:00
Amit Mahajan
d9835f0c16 Change to treat slotId 0 emergency numbers as default. 
Emergency numbers are slot specific. This change is to read emergency
numbers for slotId 0 if slotId is unknown/invalid.

Bug: 18656027
Change-Id: Ibaeb720955f6abc421b84d3cb32eb812b6c55a34
 2014-12-15 10:38:27 -08:00
smain@google.com
c21b4553cb am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download 
* commit '16d9a0378fb1c8fbefb263df2e3d627202ae677d':
  brute force improve suggestions for sdk download
 2014-12-15 18:19:05 +00:00
smain@google.com
16d9a0378f am 68e6819b: brute force improve suggestions for sdk download 
* commit '68e6819bd023d24894fc7cbb2357c685177d9b84':
  brute force improve suggestions for sdk download
 2014-12-15 18:10:45 +00:00
smain@google.com
68e6819bd0 brute force improve suggestions for sdk download 
Change-Id: I4698058a12472a65e67cadc3d0e3dd1ffed1b384
 2014-12-15 10:00:59 -08:00
Alan Viverette
9973643bfc Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 2014-12-15 17:27:24 +00:00
Alan Viverette
2649c58b46 Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 2014-12-15 17:26:39 +00:00
Christoph Studer
5c510ee551 Notification: Fix bigLargeIcon 
Fix a bug in L where BigPictureStyle.bigLargeIcon never made it
into the notification layout.

Bug: 18735551
Change-Id: Ia72d1de8cca2e95df3a99aaffeaba31325f1d858
 2014-12-15 17:00:14 +01:00
Geoff Mendal
d6fc7cf149 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-15 15:10:39 +00:00
Geoff Mendal
111a81669e Import translations. DO NOT MERGE 
Change-Id: I18accc4c251f9f5bbaa69512b317898637daed64
Auto-generated-cl: translation import
 2014-12-15 06:50:18 -08:00
Geoff Mendal
feb6c7f3d6 Import translations. DO NOT MERGE 
Change-Id: I70dc0646e4b8ea8b83dc1f7106067e278260bb3a
Auto-generated-cl: translation import
 2014-12-15 06:25:08 -08:00
Sarah Maddox
65dc25da3f docs: Updates lesson 1 of location API training: Get last-known location. 
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.
Updates the entire tutorial and code sample for clarity and correctness.

Bug: 17109822
Change-Id: I759a184a72d50702030b898a5f2e240cd3bdf4be
 2014-12-15 16:55:36 +11:00
Prem Kumar
9ef07ad2b6 Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev 2014-12-14 19:53:48 +00:00
Prem Kumar
6c2fa049aa Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev 2014-12-14 19:52:40 +00:00
Guang Zhu
07bba9abee Merge "shell based UI Automator source move" into lmp-mr1-dev 2014-12-14 03:30:57 +00:00
Jinsuk Kim
a2bc055eeb Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev 2014-12-13 23:41:48 +00:00
Rich Slogar
b2a9bd5e9b am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update 
* commit '895d16945e97e108e33c614f87004c3f1efe5cb4':
  docs: studio 1.0.1 revision update
 2014-12-13 06:24:20 +00:00
Rich Slogar
895d16945e am 6b8756c3: docs: studio 1.0.1 revision update 
* commit '6b8756c39764b166c9f7d384e4542960dd8a7f98':
  docs: studio 1.0.1 revision update
 2014-12-13 06:17:00 +00:00
Rich Slogar
6b8756c397 docs: studio 1.0.1 revision update 
Change-Id: If9ef9ba986ae02463bec8040924a06ab0ccc8124
 2014-12-12 21:19:02 -08:00