114216 Commits

Author SHA1 Message Date
Matthew Xie
9a53fbe44f am ce39e8ce: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev
* commit 'ce39e8ced8bcbc6663d420bea66280f8b438e027':
  Change pairing api/intent permission from PRIVILEGED to ADMIN
2013-10-21 16:05:26 -07:00
Matthew Xie
ce39e8ced8 Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev 2013-10-21 22:58:53 +00:00
Jay Shrauner
3e33d5a769 am 8d51c2f6: Merge "Fix CountryDetector NPE" into klp-dev
* commit '8d51c2f6fa628cc8f3e4d182df2dafdb7cbea48c':
  Fix CountryDetector NPE
2013-10-21 15:27:43 -07:00
Jay Shrauner
8d51c2f6fa Merge "Fix CountryDetector NPE" into klp-dev 2013-10-21 22:23:55 +00:00
Matthew Xie
ac2c6c3a16 Change pairing api/intent permission from PRIVILEGED to ADMIN
The APIs are createBond, setPin, setPairingConfirmation
The intent is ACTION_PAIRING_REQUEST
bug 11101076

Change-Id: I3a314efd973b3ce078ab5347159c336f222d9f15
2013-10-21 14:56:33 -07:00
Jason Monk
7d16718105 am 0aeca872: Merge "Make setting PAC require CONNECTIVITY_INTERNAL" into klp-dev
* commit '0aeca87233950933f4f48003f4ebaba342ee2ab8':
  Make setting PAC require CONNECTIVITY_INTERNAL
2013-10-21 14:44:08 -07:00
Jason Monk
0aeca87233 Merge "Make setting PAC require CONNECTIVITY_INTERNAL" into klp-dev 2013-10-21 21:40:17 +00:00
Winson Chung
5b0da90a68 am 1bab99c8: Merge "DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)" into klp-dev
* commit '1bab99c8cebbf23379c2ccad9188da1dce6fef09':
  DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)
2013-10-21 14:20:57 -07:00
Winson Chung
1bab99c8ce Merge "DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)" into klp-dev 2013-10-21 21:16:23 +00:00
Alan Viverette
c5aa0ab2e8 am ba551061: Merge "Don\'t clip keyguard security container children (e.g. glow pad)" into klp-dev
* commit 'ba551061482780264ab5bc80381e480128789bb6':
  Don't clip keyguard security container children (e.g. glow pad)
2013-10-21 13:51:10 -07:00
Alan Viverette
ba55106148 Merge "Don't clip keyguard security container children (e.g. glow pad)" into klp-dev 2013-10-21 20:48:57 +00:00
Jason Monk
1aeaf84a38 Make setting PAC require CONNECTIVITY_INTERNAL
Also disables all setting of PAC networks through the internal AsyncChannel
methods.  PAC can only be saved through addOrUpdateNetwork for permission
checks.

Bug: 11316946
Change-Id: I51016b578080c342a5e5d536ea9a3fdd4fe16644
2013-10-21 15:28:44 -04:00
Wink Saville
663345cbd3 am 089959a0: Merge "Fix typo for radio technology" into klp-dev
* commit '089959a063c437a5ad0114c0599d3790fa7cd5ab':
  Fix typo for radio technology
2013-10-21 12:05:22 -07:00
Wink Saville
089959a063 Merge "Fix typo for radio technology" into klp-dev 2013-10-21 19:03:18 +00:00
Jay Shrauner
a2c93480e3 Fix CountryDetector NPE
Fix CountryDetector NPE by calling CallerInfo.getCurrentCountryIso() which
checks for potential nulls.

Bug:11291034
Change-Id: I0a4412c432551c64ec30652d69636442653ee337
2013-10-21 11:57:20 -07:00
Christopher Tate
595c48e43d am d570dae5: Merge "Fix priv-app edge case across OTAs" into klp-dev
* commit 'd570dae5775be9df8ee218ce617c50e8097e6dcc':
  Fix priv-app edge case across OTAs
2013-10-21 11:33:35 -07:00
Christopher Tate
d570dae577 Merge "Fix priv-app edge case across OTAs" into klp-dev 2013-10-21 18:31:14 +00:00
Sungmin Choi
46401a312d Fix typo for radio technology
Bug: 11317677
Change-Id: I792517f4c3aa568b014d6c2bc0023ce5255f8abb
2013-10-21 10:13:42 -07:00
Victoria Lease
54b7e3e81c am a80d6424: Merge "Implement language-specific GSUB processing" into klp-dev
* commit 'a80d6424987602cc3141d4cb4cdee21a54747691':
  Implement language-specific GSUB processing
2013-10-21 08:58:37 -07:00
Victoria Lease
a80d642498 Merge "Implement language-specific GSUB processing" into klp-dev 2013-10-21 15:55:30 +00:00
Deepanshu Gupta
a14f25c5ef am bf3acff1: Merge "Don\'t run the async query if being rendered in EditMode." into klp-dev
* commit 'bf3acff10a62adeb0e2cefc4652c62132445c196':
  Don't run the async query if being rendered in EditMode.
2013-10-20 19:54:43 -07:00
Deepanshu Gupta
bf3acff10a Merge "Don't run the async query if being rendered in EditMode." into klp-dev 2013-10-21 02:51:20 +00:00
Scott Main
e26c353c4b am bab3348f: Merge "add xml attributes to IME javadoc" into klp-dev
* commit 'bab3348fc39e91b35c30ce05b6222cc5e8544104':
  add xml attributes to IME javadoc
2013-10-20 15:30:49 -07:00
Scott Main
bab3348fc3 Merge "add xml attributes to IME javadoc" into klp-dev 2013-10-20 22:28:11 +00:00
John Spurlock
1eeb5ff203 am d4595bd1: Merge "Move the IME navigation guard view up to decor." into klp-dev
* commit 'd4595bd1e60ba03be3dac3cae3fc2d3ae2433c7d':
  Move the IME navigation guard view up to decor.
2013-10-19 10:05:23 -07:00
John Spurlock
d4595bd1e6 Merge "Move the IME navigation guard view up to decor." into klp-dev 2013-10-19 17:03:55 +00:00
Christopher Tate
628946a6ef Fix priv-app edge case across OTAs
In this case:

   1. Privileged system app FOO is overlain by an installed update,
   2. FOO was replaced during an OTA,
   3. The new in-system FOO introduced new privileged permission requests
      that had not been requested by the original FOO,
   4. the update version of FOO still had a higher version code than
      the new FOO on the system disk, and
   5. the update version of FOO had been requesting these same (newly-
      added-to-system-apk) permissions all along;

then the newly-added privileged permission requests were incorrectly being
refused.  FOO should be able to use any privileged permission used by the
APK sited on the system disk; but instead, it was only being granted the
permissions used by the *original* version of FOO, even though the system
FOO now attempted to use them.

Still with me?

The fix is to (a) properly track privileged-install state when processing
known-to-be-hidden system packages, and (b) to tie the semantics of the
permission grant more explicitly to that evaluated state, rather than
using the prior (rather fragile) fixed-up privilege calculation applied
to the overlain apk's parse records.

Bug 11271490

Change-Id: Id8a45d667e52f3b5d18109e3620d5865f85bb9c9
2013-10-18 18:11:05 -07:00
Jim Miller
495bd54c63 am 42b7b692: Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev
* commit '42b7b6927cd31679691b216d1ba09be31c24206e':
  Revert "Fix dodgy states of keyguard transport controls"
2013-10-18 18:10:57 -07:00
Jim Miller
42b7b6927c Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev 2013-10-19 01:08:12 +00:00
Jim Miller
4d20ed3f26 Revert "Fix dodgy states of keyguard transport controls"
This reverts commit bdb5ac7ddbabec0ba947a32937d8b95738d513dc.

Change-Id: Iea8db9a590a2a3b65d941b2918345eb27f690240
2013-10-19 01:00:16 +00:00
Jonathan Dixon
d47be03137 am 43e533de: Merge "Restore 4 classes that were accidentally deleted" into klp-dev
* commit '43e533dea968bec3e53ba8046934145a0fa48a4f':
  Restore 4 classes that were accidentally deleted
2013-10-18 17:37:53 -07:00
Jonathan Dixon
43e533dea9 Merge "Restore 4 classes that were accidentally deleted" into klp-dev 2013-10-19 00:35:23 +00:00
Svetoslav Ganov
a53e1f8138 am 23757527: Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev
* commit '237575278de8cae5d20ee333fcb2ccceee257d67':
  Hide the print dialog if the printing activity is destroyed.
2013-10-18 17:29:05 -07:00
Svetoslav Ganov
237575278d Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 2013-10-19 00:26:44 +00:00
Jonathan Dixon
74fc73f62b Restore 4 classes that were accidentally deleted
Bug 11291911

These deleted classes were previously public APIs and so need to remain
in the build (but hidden) in order to keep existing apps working.
(Partially reverts Change-Id: I02549a71104b35d86d99058c71f43e054730ec7d)

Change-Id: I28e53b056f41e66645136f5e18fba2ff55a65fe5
2013-10-18 17:10:34 -07:00
Scott Main
5df0631003 add xml attributes to IME javadoc
Change-Id: I7a3505753188ba23777391a286d8595ed64777cb
2013-10-18 16:09:51 -07:00
John Spurlock
ae3349e1c3 Move the IME navigation guard view up to decor.
Although the IME windows are now allowed to extend into
the nav bar, some IMEs were making assumptions about
computed insets based on the height of the content view.

So our navigation bar view (opaque view blocking the nav bar
area to avoid the island effect when transparent) needs to live
above the content view in the hierarchy, making the content view
the same height as it was before.

A surgical spot to put the guard view is up at the root view
(PhoneWindow.DecorView).  fitSystemWindows is always called since
this view is not recreated, and the layout is stable: waiting until
the IME is attached to the window is too late to add a guard view.

This is above the screen_* layouts, so will work without having to
touch all of them.  And it only affects windows of TYPE_INPUT_METHOD.

Bug:11237795
Change-Id: I6a93f30aec83f1cecfb854073046cbc87ab4aa66
2013-10-18 18:41:22 -04:00
Scott Main
6f756e561a am 96844ed8: fix javadoc link
* commit '96844ed886cc887a34bfc2fd04fc569d9c098623':
  fix javadoc link
2013-10-18 14:50:54 -07:00
Scott Main
96844ed886 fix javadoc link
Change-Id: I509fb12393ee0b8bf78ff4110fc18420739f7c58
2013-10-18 14:43:02 -07:00
John Spurlock
0945bc1503 am ac2d61a2: Merge "Do not show immersive mode help in touch exploration mode." into klp-dev
* commit 'ac2d61a2d731946afed300d63039d6d712fd7f4c':
  Do not show immersive mode help in touch exploration mode.
2013-10-18 14:12:15 -07:00
John Spurlock
ac2d61a2d7 Merge "Do not show immersive mode help in touch exploration mode." into klp-dev 2013-10-18 21:08:58 +00:00
Adam Lesinski
16e8c4f7db am 7d292145: Merge "Prune unneeded density resources from APK" into klp-dev
* commit '7d292145f1266b9ba4a231498c84265ad5193bdc':
  Prune unneeded density resources from APK
2013-10-18 13:41:24 -07:00
Adam Lesinski
7d292145f1 Merge "Prune unneeded density resources from APK" into klp-dev 2013-10-18 20:36:58 +00:00
Svetoslav
0acad1de81 am 30d9161b: Merge "Printer list items have wrong width." into klp-dev
* commit '30d9161b8e84652d9ac504b70adacaf729fdb58b':
  Printer list items have wrong width.
2013-10-18 13:28:32 -07:00
Svetoslav
8784135245 am 7f11d0db: Merge "Clear the caller identity when dumping print system state." into klp-dev
* commit '7f11d0db2da2fefe5e1ee4d34df0aee2c26863b7':
  Clear the caller identity when dumping print system state.
2013-10-18 13:28:28 -07:00
Svetoslav
30d9161b8e Merge "Printer list items have wrong width." into klp-dev 2013-10-18 20:27:06 +00:00
Svetoslav
7f11d0db2d Merge "Clear the caller identity when dumping print system state." into klp-dev 2013-10-18 20:26:38 +00:00
Svetoslav Ganov
858a1850e2 Hide the print dialog if the printing activity is destroyed.
1. For an app to print it creates a PrintDocumentAdapter implementation
   which is passed to the print dialog activity. If the activity that
   created the adapter is destroyed then the adapter, which may rely on
   the activity state, may be in an invalid state. For example, an app
   creates an adapter and calls print resuting in the app activity and
   the print dialog activity being stacked. Now the user rotates the
   device which triggers the recreating of the activity stack (assume the
   app does not handle rotation). The recreated print dialog activity
   receives the intent that originally created it with containing the
   adapter that was constructed in the context of the old, now destroyed,
   app activity instance.

   To handle this we are limiting an app to be able to print only from
   and activity and when this activity is destroyed we mark the adapter
   as invalid which will result in hiding the print dialog activity. Note
   that if the app process is killed we already handle this in the print
   dialog activiy by registering a death recipient on the adapter binder.

2. In the PrintManager.PrintDocumentAdapterDelegate some of the state is
   accessed only on the main thread and some from miltiple threads. The
   code was trying to avoid locking for state that is not accessed by
   multiple threads but this is error prone and the benefit does not
   justify the complexity and added fragility. Now grabbing a lock all
   the time.

3. The PrintJobConfigActivity waits for it to bind to the print spooler
   service before instantiating its print controller and editor. However,
   these can be accessed by invoking some of the activity cycle callbacks.
   This change is adding null checks for the case where the activity
   callbacks are called before the binding to the spooler is completed.

bug:11242661

Change-Id: Id906b3170e4f0a0553772dfa62686f06fdca0eaf
2013-10-18 13:12:06 -07:00
Deepanshu Gupta
5a6541ebc7 am b4f33d8f: Merge "Layoutlib Create: Remove references to java package class Objects." into klp-dev
* commit 'b4f33d8f3e5926c29d848680834006bc455110c1':
  Layoutlib Create: Remove references to java package class Objects.
2013-10-18 13:06:34 -07:00
Daniel Sandler
900ece502f Do not show immersive mode help in touch exploration mode.
Bug: 11277364
Change-Id: Ifafcbff38e34c0ef08d9a466d93ce591369183a3
2013-10-18 16:05:07 -04:00